From: Alan Mackenzie <acm@muc.de>
Date: Wed, 11 Jan 2012 22:32:50 +0000 (+0000)
Subject: Merge.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~1196
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d808a98dbd8f93de498a6c8f488100b2f18b8f01;p=emacs.git

Merge.
---

d808a98dbd8f93de498a6c8f488100b2f18b8f01